Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Jul 2010 23:34:54 +0000 (23:34 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 4 Jul 2010 23:34:54 +0000 (23:34 +0000)

Trivial merge